Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 4 May 2006 13:19:19 +0000 (14:19 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 4 May 2006 13:19:19 +0000 (14:19 +0100)
commit136423974cbc8a49344224f594c510f862aa6ca1
tree8291e5ea3a2c69333aabd59f0b2076d0ace48c97
parente5fb08210d9c44e7f5addca77263080ebdcf5dd4
parentf2882b87263ff202cd1b1851d269ba76c5137adb
Merged.